:art: Add complement_code
huangqimin001
2 zmienionych plików z 31 dodań i 2 usunięć
+ 6
- 2
api/complement_views.py
@@ -42,11 +42,15 @@ def complement_code_list(request): |
||
| 42 | 42 |
user_id = request.POST.get('user_id', '')
|
| 43 | 43 |
page = request.POST.get('page', 1)
|
| 44 | 44 |
num = request.POST.get('num', 20)
|
| 45 |
+ type_ = request.POST.get('type', '')
|
|
| 45 | 46 |
|
| 46 |
- logs = ComplementCodeLogInfo.objects.filter(user_id=user_id, status=True).order_by('-pk')
|
|
| 47 |
+ logs = ComplementCodeLogInfo.objects.filter(user_id=user_id, status=True) |
|
| 48 |
+ if type_ == 'pass': |
|
| 49 |
+ logs = logs.filter(audit_status=ComplementCodeLogInfo.AUDIT_PASS) |
|
| 50 |
+ logs = logs.order_by('-pk')
|
|
| 47 | 51 |
|
| 48 | 52 |
logs, left = pagination(logs, page, num) |
| 49 |
- logs = [log.admindata for log in logs] |
|
| 53 |
+ logs = [log.data for log in logs] |
|
| 50 | 54 |
|
| 51 | 55 |
return response(200, 'Get Complement Code List Success', u'获取补码列表成功', data={
|
| 52 | 56 |
'logs': logs, |
+ 25
- 0
logs/models.py
@@ -149,3 +149,28 @@ class ComplementCodeLogInfo(BaseModelMixin): |
||
| 149 | 149 |
|
| 150 | 150 |
def __unicode__(self): |
| 151 | 151 |
return '%d' % self.pk |
| 152 |
+ |
|
| 153 |
+ @property |
|
| 154 |
+ def shot_image_url(self): |
|
| 155 |
+ return upload_file_url(self.shot_image) |
|
| 156 |
+ |
|
| 157 |
+ @property |
|
| 158 |
+ def invoice_image_url(self): |
|
| 159 |
+ return upload_file_url(self.invoice_image) |
|
| 160 |
+ |
|
| 161 |
+ @property |
|
| 162 |
+ def data(self): |
|
| 163 |
+ return {
|
|
| 164 |
+ 'user_id': self.user_id, |
|
| 165 |
+ 'log_id': self.log_id, |
|
| 166 |
+ 'name': self.name, |
|
| 167 |
+ 'phone': self.phone, |
|
| 168 |
+ 'model_id': self.model_id, |
|
| 169 |
+ 'model_name': self.model_name, |
|
| 170 |
+ 'sn': self.sn, |
|
| 171 |
+ 'shot_image': self.shot_image, |
|
| 172 |
+ 'shot_image_url': self.shot_image_url, |
|
| 173 |
+ 'invoice_image': self.invoice_image, |
|
| 174 |
+ 'invoice_image_url': self.invoice_image_url, |
|
| 175 |
+ 'audit_status': self.audit_status, |
|
| 176 |
+ } |